| commit | c9ca1b50428ac5bf1c82f4cb0efd51310066b9ec | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Apr 05 06:40:17 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 05 06:40:17 2013 +0000 |
| tree | 0baec697516ce1cf354452d66a57a4bb4d7fa868 | |
| parent | d9e6ddae2f129df3e54e86a78b930653ffb41285 [diff] | |
| parent | 14e2690970a2936941871a9c1c257b32b95303bf [diff] |
Merge "resolved conflicts for merge of a2f747d4 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp