Alex Klyubin 33d3c53da0 resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp ...

Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a

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

..

java

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

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

jni

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

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

res

am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'."

2015-02-10 01:40:59 +00:00

tests

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

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