N-MR2 N2G47H merge 'd57140d6449bc9b900dd9cae8aab303606a6a611' - clean

Change-Id: I6d4be36ea077837b957ebcaec7e6f8d3fb3fe48f
tree: 22e55d913a929e673a9916ee823016625219979b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle