Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:15:07 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:15:07 +0000 (19:15 +0000)
commit3830218b68042aa1bb9b2b40bf84e1d4329bffd5
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parentff1593ad79fbb0878d463f27749860088aba5501
parente6b4e1551223cc8d5b3d5387f6e401a2cef25d44
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887 am: 193118e5b6
am: e6b4e15512

Change-Id: Ieaa589c1bf7220cb2c8abbd20170853cb8f6c319