Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:09:24 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:09:24 +0000 (19:09 +0000)
commite6b4e1551223cc8d5b3d5387f6e401a2cef25d44
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parent0ee06597ef1787998a3ade0ac9ecaf12519d2d70
parent193118e5b60756e20a5c94d2fc15ac29a525bd8c
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887
am: 193118e5b6

Change-Id: I74271b75533ee760e7bb0353f6b1d685bc1f9cb6