tree c48c47816443582b3a3e5e8caba9f9ed3ed3117f
parent 8f0ea017b4bede35d7b74723adcc8172083269d4
parent ee62ff140b476503be4b6c22991942cf16ad9925
author Shawn Willden <swillden@google.com> 1446586718 +0000
committer android-build-merger <android-build-merger@google.com> 1446586718 +0000

Fix build failure caused by merge from DR.
am: ee62ff140b

* commit 'ee62ff140b476503be4b6c22991942cf16ad9925':
  Fix build failure caused by merge from DR.