Ta-wei Yen 427bfc0842 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp ...

am: 48fcac0445

* commit '48fcac0445741a9c4ba3bee60a5c41758c9b4068':
  Hide VoicemailContract.setQuota()

Change-Id: I236f788a0ee0e1bca73163108f055d15c7a33050

2016-05-20 01:23:22 +00:00

..

java

Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp

2016-05-20 01:23:22 +00:00

jni

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

res

Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a

2016-05-19 15:23:45 +00:00

tests

Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681

2016-05-18 02:25:10 +00:00