| commit | 20e0d7784b88dd02dfc3e380d048612a254bb01b | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Sat Nov 08 00:52:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 08 00:52:03 2014 +0000 |
| tree | fd0913bc74086caf75edfa364d2b70088f9d60fa | |
| parent | a35f2374e62fd66394356cc1db9a8e0a6e335fdc [diff] | |
| parent | 10a554c94d8ec9e43d00875d40b62b7ed037fedc [diff] |
am 10a554c9: am 5fcb7c5b: Merge to upstream r221532. * commit '10a554c94d8ec9e43d00875d40b62b7ed037fedc': Merge to upstream r221532.