OSDN Git Service

DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours am: a21a89051e -s ours am: 88582dfa7...
authorBaligh Uddin <baligh@google.com>
Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)
commit7c6f4b9e9928fae2884594ac9a70addf414b6fc6
tree3eb470ee0bba9bbb178b0a16de687da7507f0516
parent21c62d6132a0387bba6e5de264f48284c331bdcc
parent3200f49a5cff8be4ee699e08d97db7e6facd5fb0
DO NOT MERGE ANYWHERE - am: 442ae0fe5c  -s ours am: a21a89051e  -s ours am: 88582dfa7b  -s ours
am: 3200f49a5c  -s ours

* commit '3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
  DO NOT MERGE ANYWHERE -

Change-Id: I5c84dbeb236627b6858edfece00e4d67f3f2fa64