| commit | ed2aad7bff7cab98344fced7460a2f0e6188f2be | [log] [tgz] |
|---|---|---|
| author | quddusc <quddusc@google.com> | Tue Apr 15 23:19:15 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 15 23:19:16 2014 +0000 |
| tree | fc0bc388c0f2fe63fc8d826260a7ee575f730341 | |
| parent | 4c4fc3e172f7ba1a3d3c04145472d2b6607e0608 [diff] | |
| parent | 861d6348de6788b31a2d70ec84e2813df485f165 [diff] |
Merge "resolved conflicts for merge of 99c3605c to master"