Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:04:44 +0000 (19:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:04:44 +0000 (19:04 +0000)
commit193118e5b60756e20a5c94d2fc15ac29a525bd8c
treeacfe7611b16da9a996f9e9635dc79298058f31ef
parentfbdbbe93d91ab913125fdf255e6860a72e4ccb70
parenta69387d88759efe14af56fb40e690df5c4f96bf3
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f
am: a69387d887

Change-Id: I9c336b20b449ba22fa94b3a61bbcb9bbec76e8d8