OSDN Git Service

Merge changes Ib81bd82d,I9a57fca0
authorDan Albert <danalbert@google.com>
Fri, 9 Sep 2016 00:02:50 +0000 (00:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 00:02:50 +0000 (00:02 +0000)
commit17330538106312bcb24f6182c519433db43a7326
tree491c6c429b28e9b4a0eeecd6c4543c601755ead3
parentd81ba2043af0f042eab21a74a314f62d84c932c3
parent247f3189516fc10f85ab88b8f730b26b166af63e
Merge changes Ib81bd82d,I9a57fca0
am: 247f318951

Change-Id: Ida1e741039ffcf58d15c9745eefa1f86ec378eb7