| commit | bc0fbaebec174e9058fb57e77466ca8481a889de | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Sat Jun 07 12:26:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 07 12:26:17 2014 +0000 |
| tree | da88b33003886b3a75b303763cfc464e379eec72 | |
| parent | c42ef37e2822e95e28162fb1477e332052ff4b39 [diff] | |
| parent | e6a4613cf3cfbcca14736cd97b9f8ba7bc01d1f0 [diff] |
am 8f04539e: (-s ours) Fix build * commit '8f04539ef2c88bdaf9c89bd14b7c23d30ad8ba09': Fix build