| commit | 635d8a06fe9f0fe837eeb36e833a18d36967c338 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 21:57:46 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 30 21:57:46 2013 +0000 |
| tree | ffff6872edc3069b28d11e6ae44b6899ee739409 | |
| parent | f24054065cd2f7ff0ec2c9bb6a9983b7e2100ff9 [diff] | |
| parent | ec985147ec781dfff9a229c6b794ee4eac0ced91 [diff] |
Merge "Revert "Merge downstream branch 'developers-dev' into 'klp-dev'"" into klp-dev