OSDN Git Service

resolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2
authorSathya Kumar <sathyakumar@motorola.com>
Tue, 16 Aug 2016 22:39:44 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Aug 2016 22:39:44 +0000 (22:39 +0000)
commit398e66e8c01545481e5ca8fe748f5aecb58ea760
treeea07a6ff3fdcf88cf06e305b3adab2023f63bc72
parente0833a770ac24c362bfe6d78745e28e7d805468b
parent218d3df09ae0b168517c3cfe8169e97cfa425bbb
resolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2
am: 218d3df09a

Change-Id: I6e516cb2bcac807c917dc6a22ab13a81b229bb69