Anthony Hugh 7b737c809d am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev ...

* commit '097f8d5f6b82f27e71ec72795dee053dfc698ac5':
  Update "Optimizing app X from Y string"

2015-03-05 04:08:32 +00:00

..

java

Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev

2015-03-05 00:15:08 +00:00

jni

am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"

2015-02-27 18:52:36 +00:00

res

am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev

2015-03-05 04:08:32 +00:00

tests

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

2015-02-11 12:37:12 -08:00