Jorim Jaggi 3c45bc6fde Merge "Remove optimization to report config change" into nyc-dev am: df551dda12 am: 1ef9359662 ...

am: 54423e2947

* commit '54423e2947a8e0219aeb7cabb4c03111b56745b5':
  Remove optimization to report config change

Change-Id: I51cc7d3ce50bac4c46d12eefc74cfba798a14acc

2016-04-28 20:38:32 +00:00

..

java

Merge "Remove optimization to report config change" into nyc-dev am: df551dda12 am: 1ef9359662

2016-04-28 20:38:32 +00:00

jni

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

res

Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a

2016-04-28 19:33:53 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b

2016-04-26 18:54:37 +00:00