| commit | 9252d224ddabf18b929941bf297fb121598a4112 | [log] [tgz] |
|---|---|---|
| author | Keun young Park <keunyoung@google.com> | Wed Aug 29 12:13:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 29 12:13:09 2012 -0700 |
| tree | b696531ff20dec7b3a22b555a681bff24aa4b61f | |
| parent | bb529db47e83fb6e193d5aea845c6a0466316a04 [diff] | |
| parent | 1b9bcc8f5d50c34240a17aa96f55ec62d4cb30da [diff] |
am 1b9bcc8f: (-s ours) am 983740d3: merge reboot after / before from mr1 DO NOT MERGE * commit '1b9bcc8f5d50c34240a17aa96f55ec62d4cb30da': merge reboot after / before from mr1 DO NOT MERGE