OSDN Git Service

Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
authorHugo Benichi <hugobenichi@google.com>
Wed, 29 Jun 2016 00:25:13 +0000 (00:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 00:25:13 +0000 (00:25 +0000)
commitca9a575a79b8de15a6a2ae1597a1d0e484b51090
tree5970d9c68309718becd5424f7a9884706f917c8d
parent925464f98679d3872f46b0365acce5a9cf2368bf
parent41a3acc55ad8fd4fe6fba5f2b645da3191e020d1
Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
am: 41a3acc55a

Change-Id: I393032c574d5820b37e3a2bbfb412b7bc45d97f2