tree 008ac1c92451a2f4eae4cd28929b9be301f399b5
parent 9cddbd258d24029a6498898e96cb53aa62349767
parent 37764c71a0ac79142f90bb112b6cabffb940b955
author Narayan Kamath <narayan@google.com> 1395930837 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395930837 +0000

Merge "Cherry pick parts of f5df700e6ce."