Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:48:35 +0000 (18:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:48:35 +0000 (18:48 +0000)
commita69387d88759efe14af56fb40e690df5c4f96bf3
treeacfe7611b16da9a996f9e9635dc79298058f31ef
parentc9b0c26d5c9f20af5a0f6fc5a8026f529e1c578f
parent83683a367f39ab901d0e6419256010d9e4835b2a
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
am: 83683a367f

Change-Id: Id16aa41cac62e174574184d9deb00550dbd507a1