Alan Viverette 59d045e7a0 Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am: 22f887a014 am: 483a8dc097 ...

am: 23f6f62ea4

Change-Id: Id34e978aa6a26e08bab147ea3e1aa3a6282227af

2016-06-23 01:12:46 +00:00

..

java

Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am: 22f887a014 am: 483a8dc097

2016-06-23 01:12:46 +00:00

jni

Merge "resolve merge conflicts of 79116da to master"

2016-06-22 21:17:45 +00:00

res

Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641

2016-06-23 00:25:06 +00:00

tests

Merge "Refactor the java side APCT perf test"

2016-06-22 17:05:03 +00:00