Ying Wang e77a906653 am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev ...

* commit 'bb637938d476e7927d2eed53255a3be7f5dd2d19':
  Frameworks/base: AndroidRuntime standalone preloaded-classes

2014-11-17 19:23:25 +00:00

..

java

resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp

2014-11-17 10:56:26 -08:00

jni

am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev

2014-11-17 19:23:25 +00:00

res

am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev

2014-11-17 17:39:16 +00:00

tests

am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:40:28 +00:00