| commit | 2a46bf18f66e8564c3c838f6b06dda5ae419558c | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Sat Jan 16 02:34:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 16 02:34:22 2016 +0000 |
| tree | dab81863124ce504a8e8b0226092f821dcdf9557 | |
| parent | b1ee7aadbcdf2f13593f4f1c21555dfa66e96876 [diff] | |
| parent | 7a0b1e1fd963a31ef02efc3f4877084817f4dd5f [diff] |
DO NOT MERGE ANYWHERE am: 570bf7f2a9 -s ours am: 7a0b1e1fd9 -s ours * commit '7a0b1e1fd963a31ef02efc3f4877084817f4dd5f': DO NOT MERGE ANYWHERE