OSDN Git Service

resolve merge conflicts of 4058a71 to stage-aosp-master am: 538ed261eb am: 4a673770cb
authorTao Bao <tbao@google.com>
Mon, 11 Jul 2016 19:58:20 +0000 (19:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jul 2016 19:58:20 +0000 (19:58 +0000)
commit47f87e741b4c8e52c8b53c83c80ba80eaf893241
treeacd9a2c58b6f4cff4845055b9becc884d287789b
parentd88677006126e48d12a47c150fcad9b19f240dae
parent6bd0909da94087401960c1840726dd8ffb9d06b7
resolve merge conflicts of 4058a71 to stage-aosp-master am: 538ed261eb am: 4a673770cb
am: 6bd0909da9

Change-Id: I17500f2a01908c0c178390f893aa065e02ea14ca