| commit | f3c12f4d7d0e3ebb508fe647c5901ca609f951be | [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 | ff7230a770de55a9431a7298c7687678f1187c23 [diff] | |
| parent | 60eb73ed6a537c79f57bf03f1c3c7ebd04f409ea [diff] |
am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\' * commit '60eb73ed6a537c79f57bf03f1c3c7ebd04f409ea':