| commit | 10d29e155073f872125180200cd471d27a33682f | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Thu Nov 01 18:10:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 18:10:32 2012 -0700 |
| tree | ad3c9c792aca95e578a9bd2a6c59949fd9d8ca80 | |
| parent | ebbf5eea2b288700108aaffe3a8dce9ec4b085f7 [diff] | |
| parent | 39912f7fcd5bfc4943bac1746c3ff2a9f1d93043 [diff] |
am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev * commit '39912f7fcd5bfc4943bac1746c3ff2a9f1d93043':