| commit | 1677a9bdeba3961625236925e754920fca1b7e89 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:32:30 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 13 02:32:31 2014 +0000 |
| tree | 0a7bf884bd82cf61ba77199a0aac6b633716d8c6 | |
| parent | 7377c7be6abcb3bccabb6cdf2af0ecfed355606c [diff] | |
| parent | 51cce0ec42a04f94569e8da544b02c888b82b31d [diff] |
Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp