Griff Hazen 472b990ae1 am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev ...

* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
  Improve support for the barcode-on-screen use case for wearables.

2014-11-04 15:33:17 +00:00

..

java

am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev

2014-11-04 15:33:17 +00:00

jni

am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev

2014-11-04 02:21:11 +00:00

res

Import translations. DO NOT MERGE

2014-11-03 06:58:11 -08:00

tests

am befe778c: Treat optimistic addresses as global preferred.

2014-10-30 19:10:04 +00:00