Jesse Hall 9ee0999bcb resolved conflicts for merge of 78df7b5e to master ...

Change-Id: I27076f5e6f747a006dcac7cd334cacf56dd57bd5

2013-05-06 16:04:53 -07:00

..

java

am a8549041: am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev

2013-05-06 13:56:17 -07:00

jni

resolved conflicts for merge of 78df7b5e to master

2013-05-06 16:04:53 -07:00

res

Import translations. DO NOT MERGE

2013-05-06 09:46:51 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00