Ian Rogers 8dbfde5047 am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" ...

* commit '0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
  Add a call to registerAppInfo for the VMRuntime

2014-01-07 21:41:34 +00:00

..

java

am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"

2014-01-07 21:41:34 +00:00

jni

am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

2014-01-07 13:04:10 +00:00

res

Import translations. DO NOT MERGE

2014-01-06 12:16:37 -08:00

tests

XmlUtils#readThisMapXml should handle null keys.

2014-01-06 11:18:21 +00:00