OSDN Git Service

Merge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53
authorJosh Gao <jmgao@google.com>
Wed, 29 Jun 2016 22:00:52 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 22:00:52 +0000 (22:00 +0000)
commitcc44959be21203363f1f93be36b6f31f13a69eb9
tree1a03241360055e48c0ccb200f791aa40903a3356
parent9fc378632b0067069e08f4f9e0d931f097ad6842
parent41ccbf97296e89bb04676aef3577c0ba590e9c31
Merge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53
am: 41ccbf9729

Change-Id: Ic0e62cf54e8254e04d61e020cdb0d2a08f0d6959