resolve merge conflicts of 9b726ab8 to master am: 02473c7876
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 20:25:08 +0000 (20:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Sep 2017 20:25:08 +0000 (20:25 +0000)
commitf3cf47e265d4bf2d6444fd45e4fabb5edeea3e24
tree0cf76e404c1dc1a784b50062e6d9200d13c21f02
parentffbcd90dbd6c740386686ba0c9de61514de9fa7e
parentb1cc8aeac9ab7d00e86f2a997a4ad1e942157224
resolve merge conflicts of 9b726ab8 to master am: 02473c7876
am: b1cc8aeac9

Change-Id: I9511ee86a53661327a19ca4793e45ac933cb2d1c