| commit | 08ddd6901c4ea666546ea29fe0576a106950a333 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 11:54:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:51 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 2cc226c7b86fe1568b40e9baf9dfccbd2a345340 [diff] | |
| parent | 920012c26c1b3f7f0254e0b0559874c777102fe3 [diff] |
am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\' * commit '60eb73ed6a537c79f57bf03f1c3c7ebd04f409ea':