Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:15:24 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:15:24 +0000 (20:15 +0000)
commit77336cdec106e3e70e03210f2368b0a8b22bb15e
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parent582688df21b745673c2136e65bf64142a4b74110
parent3830218b68042aa1bb9b2b40bf84e1d4329bffd5
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887 am: 193118e5b6 am: e6b4e15512
am: 3830218b68

Change-Id: I2a20446f07adb9335bdc0a125e77d6f7133eda00