OSDN Git Service

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

Change-Id: Iea6ebf94adbceda7a6e11d0fefbecd812604ce65


Trivial merge