OSDN Git Service

Merge changes Iedab3259,I333fe8ae
authorDan Albert <danalbert@google.com>
Tue, 2 Aug 2016 21:56:17 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 21:56:17 +0000 (21:56 +0000)
commitce990485fbb7146dfe3098074bbb4d33e129cac9
tree3fb0dfb09bcf322de0e1e3e5a3c9d133839fb94e
parentb340e0a6608a93e498af404247fd1f51de23ade2
parent0fb3b0aec48457e34d46ceac4205acbdb788444e
Merge changes Iedab3259,I333fe8ae
am: 0fb3b0aec4

Change-Id: I4eeb1ce1eb8b8b8bbefa38ab339a649fa2e793e4