| commit | 9adb8197be61e27e5ad0e5bc4e863dd71b940119 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Tue May 13 16:30:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 16:30:07 2014 +0000 |
| tree | 5e48863a0c76a1fe56905b1a2d1704f89ad039a5 | |
| parent | 348f371ca297d13bbb65bdf8f84c3e71f81d0d24 [diff] | |
| parent | fbb008083b0320521c3b8afa17541621f4fdfcc7 [diff] |
am fbb00808: (-s ours) Fix the build [DO NOT MERGE] * commit 'fbb008083b0320521c3b8afa17541621f4fdfcc7': Fix the build [DO NOT MERGE]