Adam Powell f4071c709d am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev ...

automerge: bee1def

* commit 'bee1def31bb7a3a22e7c83904a3d8c418eeb5e48':
  Add DENSITY_280

2015-02-12 07:49:31 +00:00

..

java

am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev

2015-02-12 07:49:31 +00:00

jni

Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

2015-02-10 20:57:45 +00:00

res

Rewrite of the settings provider.

2015-02-11 17:58:22 -08:00

tests

am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 20:47:31 +00:00