Amith Yamasani c731dd758d Merge "Localize owner\'s name to current locale until changed" into nyc-dev am: df4c40d ...

am: 195ed1e

* commit '195ed1e61b52a1c0616846c61029b5db7c89928d':
  Localize owner's name to current locale until changed

2016-03-23 22:45:35 +00:00

..

java

Merge "Localize owner\'s name to current locale until changed" into nyc-dev am: df4c40d

2016-03-23 22:45:35 +00:00

jni

Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev am: 6266d8c

2016-03-23 16:45:52 +00:00

res

Merge "Ensure notification color contrast" into nyc-dev am: 9b95f61

2016-03-23 18:47:54 +00:00

tests

resolve merge conflicts of 8416096 to nyc-dev-plus-aosp

2016-03-23 22:40:16 +00:00