| commit | aa41ba3b4388bda947f37464ae2783f3dcff4f4e | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Jun 04 17:28:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 17:28:43 2014 +0000 |
| tree | 493000df616e0055d18ab510a4c5004ea918c23a | |
| parent | c39b832b00a63bfb1baabd8f5e439f05d688d440 [diff] | |
| parent | 2e1616a99d271deca4e18d0406d6d3652106dfda [diff] |
am 2e1616a9: (-s ours) am 1e3d0c89: (-s ours) Fix AOSP build (DO NOT MERGE) * commit '2e1616a99d271deca4e18d0406d6d3652106dfda': Fix AOSP build (DO NOT MERGE)