OSDN Git Service

Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 560033035b -s ours
authorSharvil Nanavati <sharvil@google.com>
Sat, 30 Apr 2016 04:15:29 +0000 (04:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Apr 2016 04:15:29 +0000 (04:15 +0000)
commite460c29607ce0681976146159c3aae8fde45ec1b
tree6962c421b6b663ab9ead72d97b0a5ae6e43a846a
parent9f32b9e3cb9a89b59f5185fa6968432beb83621c
parent9c68fd9a4d4e832664aeb91380bc5d1c444b4a2b
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 560033035b  -s ours
am: 9c68fd9a4d  -s ours

* commit '9c68fd9a4d4e832664aeb91380bc5d1c444b4a2b':
  DO NOT MERGE ANYWHERE

Change-Id: Idee1fabfffc5a3cc04e8aaf7d586bbd4c41e9e3a