RoboErik fdc7f747f2 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev ...

automerge: 216c089

* commit '216c089834e92733055a17bcade7ca1971677b49':
  Scale bitmaps in metadata sent to the system

2014-11-21 01:48:44 +00:00

..

java

resolve merge conflicts of f2235b6 to master.

2014-11-20 17:27:36 -08:00

jni

am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 23:47:07 +00:00

res

am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev

2014-11-21 01:48:44 +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