tree 79c03a3e020a6311c2f3034116ac341e0319a3a8
parent 66b36517d2e5c516d8231be647736b1485d6e72d
parent 3587c22e5579606728173cd569d7a3bec2c4d64a
author Mitchell Wills <mwills@google.com> 1472519602 +0000
committer android-build-merger <android-build-merger@google.com> 1472519602 +0000

Merge commit 'cb8b5af' into nyc-dev-plus-aosp
am: 3587c22e55

Change-Id: Ife0d09d14b4244bfc0c42d79653032b84a1e5c52