OSDN Git Service

DO NOT MERGE ANYWHERE am: 95f816945a -s ours
authorSharvil Nanavati <sharvil@google.com>
Sat, 30 Apr 2016 04:15:25 +0000 (04:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Apr 2016 04:15:25 +0000 (04:15 +0000)
commit813a0cb118a44260943b418b197f5923c02c822c
tree6962c421b6b663ab9ead72d97b0a5ae6e43a846a
parent011012f6051cf27424d55e83ca959aaa4be641bf
parent0e2a631634ff759cba204b027284fa2ba3a07ba6
DO NOT MERGE ANYWHERE am: 95f816945a  -s ours
am: 0e2a631634  -s ours

* commit '0e2a631634ff759cba204b027284fa2ba3a07ba6':
  DO NOT MERGE ANYWHERE

Change-Id: I90953865e007542f493d6da6c47599e71467b664