OSDN Git Service

resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master am: 619e5c8ecc am: c0d6a...
authorfionaxu <fionaxu@google.com>
Thu, 7 Sep 2017 12:47:28 +0000 (12:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Sep 2017 12:47:28 +0000 (12:47 +0000)
commit64b70b7dc7f4b7056c2f020907a9de99bdebad5e
treedf2b9f7e21539da3a0f5dbd3a8eedcc18d7ee7f6
parent9f414c23bc62b281d46677af16c98bf16929065a
parente7644a022c104c960c98883435dc727a273c2d91
resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master am: 619e5c8ecc am: c0d6acf08c  -s ours
am: e7644a022c  -s ours

Change-Id: I503326b282a1a2c3a5cdc1d89abb2e2e6d7d5fbe