| commit | fb0e3a74415c9e3c6611a8f79f2d2f69c5811ef3 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Oct 16 21:54:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 21:54:11 2015 +0000 |
| tree | ffb29870bb558b27cac0b6f1e477f004036373cc | |
| parent | 9cba5646180793eeb6137a08269a5173cd685301 [diff] | |
| parent | c275e2d72e22ebc88ee3c128e2405543eafc65ef [diff] |
am c275e2d7: am b3d9f563: Reconcile with master after mass cherrypicks * commit 'c275e2d72e22ebc88ee3c128e2405543eafc65ef': Reconcile with master after mass cherrypicks