| commit | 52815c3bb45593ba74395adaa5b69be6e9a604e5 | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Fri Oct 16 20:37:46 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 16 20:37:46 2015 +0000 |
| tree | 5ef68d6d87b02ebb93eeae5c3312621765744a69 | |
| parent | 97339f196fe0cea06a6c9eff0ba3ce285ba2ef50 [diff] | |
| parent | c72c931eb8c5c336b9cb8b600b9e777ca169687c [diff] |
Merge "resolved conflicts for 429e7dcd to master"