Deepanshu Gupta 288d32b92b am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] ...

* commit '17e0eebdc6223de1f94b5ee538919adda9f58a9a':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

2014-05-02 19:30:43 +00:00

..

java

am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

2014-05-02 19:30:43 +00:00

jni

am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

2014-03-19 15:21:09 -07:00

res

am 8cb2f42e: am 948282b0: Add support for handling mobile provisioning networks.

2013-08-29 10:26:06 -07:00

tests

resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:50:13 -07:00