| commit | 44647d20779b7cf53bc9caca1eaf12666428a3ea | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue May 22 06:43:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 22 06:43:17 2012 -0700 |
| tree | 875366a20398565917cb627e57d8320e79b280e8 | |
| parent | 851d6c79e23793b3dc01a78054206deb33cf510b [diff] | |
| parent | 12a79bbd8afb69b4221a541be1c8ad37e96e3330 [diff] |
am 12a79bbd: Merge "Back-port NDK STLport template fix." * commit '12a79bbd8afb69b4221a541be1c8ad37e96e3330': Back-port NDK STLport template fix.