| commit | ac3a8d117aa58eaff833daa134c8b6b4dbef908e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:13:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:13:45 2015 +0000 |
| tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
| parent | 2d4fd6911f462543d66fc797507bac50e7e7fab2 [diff] | |
| parent | 887ae4e47625c78c32d159bc2cad64fddb96c3b4 [diff] |
am 887ae4e4: (-s ours) am d9a1ece6: (-s ours) am 3d932268: (-s ours) am 0d18311f: (-s ours) am 1aaf9fc6: (-s ours) am fb053119: (-s ours) am 6038c48b: (-s ours) am 64b45509: (-s ours) DO NOT MERGE ANYWHERE: Merge commit \'7679e48230a3b2ddb530c6626825fd7bd854bd24\' into manual_m * commit '887ae4e47625c78c32d159bc2cad64fddb96c3b4':