Merge manually from fa9cb0e70440, conclusively use Lolipop API level 21. ICAL4J_EMBED_1 tip

Merge manually from 842945e5b782, correct build configuration to assert. ICAL4J_EMBED_1

Decide on Lolipop API level 21 after testing concluded stable operation. default

Correct import and other build configuration to use assertions.

Avoid build time optimization symbol conflicts by removing duplication.

Back out change e1ea0f6a5a50 to implicitly match Android runtime name.

Correct build by partially backing out maintenance change e8c0da59391a. ICAL4J_EMBED_1

Back out change b9b0fbab11a4 to implicitly match Android runtime name. ICAL4J_EMBED_1

Correct build time dependency of assert added in changeset e8c0da59391a. ICAL4J_EMBED_1

Manually merge changeset e1ea0f6a5a50, explicitly specifying app name. ICAL4J_EMBED_1

(0) -30 -10 tip

mercurial