| commit | de3ff60d5a30c7a3d157ac95b2f7985aaae73a25 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jun 06 10:30:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 10:30:49 2014 +0000 |
| tree | 42d87177b3990697d45175483e76f0c321155560 | |
| parent | 141e35034a8da26b7bf47ee69a847f7cbc350688 [diff] | |
| parent | b7b92ae22c172bbeb7af0d1e1efea9ee24976460 [diff] |
am b7b92ae2: Merge "Fix build." * commit 'b7b92ae22c172bbeb7af0d1e1efea9ee24976460': Fix build.