| commit | 8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Mar 21 20:19:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 21 20:19:54 2014 +0000 |
| tree | 469ca3cce3b05e01754f2aacb8b26f385b2531f7 | |
| parent | caf947737d3e94d2f5d839ec1fa951df7937fdb2 [diff] | |
| parent | a42cb8b0e2b8fdfbac1a6590d6b60814caa01088 [diff] |
Merge "resolved conflicts for merge of a67e34c8 to master"