| commit | 27162ffddab31cb4d7f4eb1177c5fe7fc48875a9 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 15:09:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 30 15:09:53 2013 -0700 |
| tree | ffff6872edc3069b28d11e6ae44b6899ee739409 | |
| parent | 36b8e5d42e05e04299b0e218bc6e23bddd0feb42 [diff] | |
| parent | 635d8a06fe9f0fe837eeb36e833a18d36967c338 [diff] |
am 635d8a06: Merge "Revert "Merge downstream branch \'developers-dev\' into \'klp-dev\'"" into klp-dev * commit '635d8a06fe9f0fe837eeb36e833a18d36967c338': Revert "Merge downstream branch 'developers-dev' into 'klp-dev'"