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