| commit | 2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Aug 23 14:58:43 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 23 14:58:43 2012 -0700 |
| tree | 67d924752ee2b6a73f897e7df11378a396764d28 | |
| parent | 9455f8f2667bd86a7e51b19112f759406274e76b [diff] | |
| parent | 2e5b13ef952436a3794d36352f5a2a0381ca4ddf [diff] |
Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp