Chih-hung Hsieh b21f69181f Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361 am: cfae35a400 am: 86f5b560af ...

am: 1099ea59c5

* commit '1099ea59c575f4445364359cfa74d9afb6d1dd4d':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I7ddd16cdf438ab53726ea546c86e6f9e9b6027ce

2016-05-27 23:37:43 +00:00

..

java

Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565

2016-05-27 23:35:36 +00:00

jni

Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361 am: cfae35a400 am: 86f5b560af

2016-05-27 23:37:43 +00:00

res

resolve merge conflicts of 8de7c95 to master

2016-05-27 16:10:34 -07:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45

2016-05-24 21:47:36 +00:00