OSDN Git Service

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

* commit '442ae0fe5c76ddabe52e595689a86838820ecbf1':
  DO NOT MERGE ANYWHERE -

Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433


Trivial merge