Google Git
Sign in
android/platform/packages/apps/Settings/6f94ffe
commit
6f94ffe44c38f7af4b4ec41c6c874e1335e79a85
[log]
author
Dmitry Dementyev <dementyev@google.com>
Wed Mar 08 16:32:00 2017 -0800
committer
android-build-team Robot <android-build-team-robot@google.com>
Wed Aug 23 19:22:12 2017 +0000
tree
dba5275bd897fa9d9177225e17ceb1eb97297cf9
parent
f04e4b7693fb08095e466bfae9ab46ccb6e20493 [diff]
resolve merge conflicts of 3964c51bf2 to nyc-dev

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit 0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)
1 file changed
tree: dba5275bd897fa9d9177225e17ceb1eb97297cf9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. MODULE_LICENSE_APACHE2
  8. NOTICE
  9. proguard.flags
  10. wrap_alpha.py