| commit | 54d535bd57a2873e1e34b7a42cef14ace8e1d694 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Mon Aug 13 16:01:02 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 13 16:01:02 2012 -0700 |
| tree | d2d801d0ce8940c5f2c0860efb96f60c89d9570d | |
| parent | bc6ee3447aea457b3297bb68df5ba053d55adad4 [diff] | |
| parent | c1e68d133cb587be4f77a0a7f3affd42b2408412 [diff] |
Merge "Merge commit 'e0df2c4f' into fix-merge-conflict" into jb-mr1-dev