| commit | dfcbb8721f288b32cf50adcadfaa59b0e042df8d | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon May 16 14:20:45 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 16 14:20:45 2016 +0000 |
| tree | 291662b0bfd9b36f965582178fc317070d58fd68 | |
| parent | 3b48949a3a61cf23d57f45cf7c0a3f94febdb376 [diff] | |
| parent | e6f6c4206cf56ad7a5b218625a3ecfe167e0a837 [diff] |
Merge "Merge commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87' into manual_merge_3fe4a71" into nyc-mr1-dev-plus-aosp