OSDN Git Service

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

* commit '88582dfa7bb9be8e87b091a7fa705b6669390f8d':
  DO NOT MERGE ANYWHERE -

Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042


Trivial merge