| commit | f1efa3eecc720d5920cbb1cf3fc1c4da3252f5a4 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Mar 27 14:31:23 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 27 14:31:24 2014 +0000 |
| tree | 0ac716c2af4fc41ce7a79f15284883c97314c2a6 | |
| parent | ddaba4360b86f96307ec88f0d0b145425bc3e128 [diff] | |
| parent | ecd072161ec57ba8dfb26659511c0f6605601560 [diff] |
Merge "resolved conflicts for merge of 22d07464 to master"