commit | 7289b6497678da291b390dadbbd4a385f18f4aa1 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Mar 27 14:33:57 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 27 14:33:57 2014 +0000 |
tree | 008ac1c92451a2f4eae4cd28929b9be301f399b5 | |
parent | 9cddbd258d24029a6498898e96cb53aa62349767 [diff] | |
parent | 37764c71a0ac79142f90bb112b6cabffb940b955 [diff] |
Merge "Cherry pick parts of f5df700e6ce."