| commit | 73e6923ed2244f3938bde546b200498feef7d6f2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Apr 24 14:31:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 24 14:31:25 2012 -0700 |
| tree | 18c9886ccc47b15763dec146430fa100700e8be5 | |
| parent | d5d2da12764d383106d45d0e58eb920e4f52d039 [diff] | |
| parent | 7ed999aaf00a71d99975a4a068ba2562c0aabc88 [diff] |
am 7ed999aa: (-s ours) am c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x." * commit '7ed999aaf00a71d99975a4a068ba2562c0aabc88': Fix build problems with gcc-4.6.x.