tree ca53aecfe18fe3ad3c5cc9ce130b7cd5cfe0f260
parent be4eae9f9f2d86e99ceb3977778ba7c1ba47aea4
parent 619682b960eca422fbf0387e0bc32875c76bf170
author Tim Murray <timmurray@google.com> 1468888384 +0000
committer android-build-merger <android-build-merger@google.com> 1468888384 +0000

Merge changes I15da2563,I7845542d into nyc-mr1-dev am: 7b8b1aab93
am: 619682b960

Change-Id: I98afd5bead70cf25ca43e49c1215ccef1e472a83