tree a3b9f90679015bbfa28d14ad0626635d43c4ddcc
parent 98536b07fcc7af8b3e1e034038fdcb9a519bb101
parent 1d26b40ed5b9a8739425c252603c529d9f8d63fb
author Josh Gao <jmgao@google.com> 1487136245 +0000
committer android-build-merger <android-build-merger@google.com> 1487136245 +0000

Merge changes I32567010,I400d5991
am: 1d26b40ed5

Change-Id: Ic4046bdbaf0b11936f2ea1e66bccebf72f9d7bdf