OSDN Git Service

DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours
authorBaligh Uddin <baligh@google.com>
Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)
am: a21a89051e  -s ours

* commit 'a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
  DO NOT MERGE ANYWHERE -

Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5


Trivial merge