tree 46a8a2d6d9f84f6046f52541b805f5ccfe14a200
parent 3199e1502382a037e6bb9b3ae11429fc18fe9917
parent 1b8ffe3331233ba4902d94670cd257e7df9ee09d
author Andrew Hsieh <andrewhsieh@google.com> 1379469354 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1379469354 +0000

Merge "Move Teapot to android-17 and set APP_ABI := all"