Narayan Kamath ecd072161e resolved conflicts for merge of 22d07464 to master ...

Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d

2014-03-27 14:22:47 +00:00

..

java

Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register."

2014-03-27 00:20:24 +00:00

jni

resolved conflicts for merge of 22d07464 to master

2014-03-27 14:22:47 +00:00

res

Make quantum text styles public

2014-03-26 18:41:14 -07:00

tests

Merge "Revert "Expand install observer semantics""

2014-03-26 20:00:11 +00:00