tree 3a65f6afcf50aa5eae4dee0327015e2c66c3f1a3
parent 2d60e94466e63df23f80ba9f9e97c6f4588c2589
parent 301a724210cf9ed69b68c5cab92e87a7cccb73f4
author Jeff Sharkey <jsharkey@android.com> 1458253086 +0000
committer android-build-merger <android-build-merger@google.com> 1458253086 +0000

Merge "Follow framework refactoring." into nyc-dev am: 8196a91
am: 301a724

* commit '301a724210cf9ed69b68c5cab92e87a7cccb73f4':
  Follow framework refactoring.