| tag | 2b32c61ee7b7e2b550a288ab74d226ed07a4acd2 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 02 10:51:09 2016 -0700 |
| object | 0e7af778b59c0ff590e21fcce8cfc9176dc0d13d |
Android CTS 6.0 Release 12 (3417974)
| commit | 0e7af778b59c0ff590e21fcce8cfc9176dc0d13d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Apr 01 12:19:46 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Wed Apr 01 12:19:46 2015 -0700 |
| tree | baf85c541a55a05fa97a9e00202b45ae8a9871cf | |
| parent | 1ef6591e7fded42fc7751b0c6c2003e0fd72f142 [diff] | |
| parent | e2c7d491617321319ec4f7c3c67b746c2b5b6482 [diff] |
resolved conflicts for merge of e2c7d491 to master Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525