| commit | da54c5b6d229fc0075c1ca401933195c38b932fb | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jul 14 19:19:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 19:19:15 2014 +0000 |
| tree | b4f7a2aa39141b1d447f9ce2fc3de49b667f6138 | |
| parent | 24f369a6cc62584f90647f51d77781dab9ea3ee0 [diff] | |
| parent | 06ca5fadbdb2f2f97895a43cf4e866b9f25ea008 [diff] |
am 06ca5fad: am 611dceec: am ce61f74f: am 56cbd19b: Merge "Fix build." * commit '06ca5fadbdb2f2f97895a43cf4e866b9f25ea008':