| commit | 71a9b3243517d1c5cfeaf87d431d9d799504b17e | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Sep 22 20:02:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:02:18 2015 +0000 |
| tree | 307f10d5342c2fcf823920ca7e0af2a38ee135f8 | |
| parent | 24d8eb714dc32e02a3f38ac0536cf459de436bb7 [diff] | |
| parent | e22f5f490cb69e30e8a2630868e58db41838bcb3 [diff] |
am e22f5f49: (-s ours) DO NOT MERGE - Fix build for commit 69ae6a87 * commit 'e22f5f490cb69e30e8a2630868e58db41838bcb3': DO NOT MERGE - Fix build for commit 69ae6a87