Amith Yamasani 9f62bf9370 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp ...

am: b8ab1d3b12

Change-Id: I9f4879ae27560ade8fa4e6124908c3dced68feb1

2016-06-08 19:03:36 +00:00

..

assets

…

res

Import translations. DO NOT MERGE

2016-06-07 17:02:34 -07:00

Android.mk

…

AndroidManifest.xml

resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp

2016-06-08 19:03:36 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…