| commit | dfb4cbf8eee10869586a6efa910e2eda08c4bf91 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Aug 27 20:33:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:33:07 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | ce88d520e54893fc6eba54ca95cc5ce956ee2f0d [diff] | |
| parent | 342e637ae25cf4189198d0d49b89ae61763ed0c1 [diff] |
am 342e637a: am dfd2e453: (-s ours) am 725569fd: am e3884972: Merge "Don\'t use `register`." * commit '342e637ae25cf4189198d0d49b89ae61763ed0c1':