OSDN Git Service

DO NOT MERGE ANYWHERE
authorSharvil Nanavati <sharvil@google.com>
Wed, 20 Jan 2016 04:31:38 +0000 (04:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jan 2016 04:31:38 +0000 (04:31 +0000)
am: 95f816945a  -s ours

* commit '95f816945a174f890b960330445087c3409f3327':
  DO NOT MERGE ANYWHERE


Trivial merge