Ying Wang cd69b5a2de am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." ...

* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.

2014-12-16 20:57:35 +00:00

..

java/android

Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev

2014-12-13 23:41:48 +00:00

jni

am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

2014-12-11 21:02:08 +00:00

lib

…

mca

Cleanup Obsolete LOCAL_PRELINK_MODULE.

2014-12-16 12:45:49 -08:00

tests

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

2014-11-21 09:57:52 -08:00