commit | 214c74747d0ff8219e020c5edc6f12bca923b45a | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Fri May 10 12:44:09 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 10 12:44:09 2013 -0700 |
tree | 25cf68db77e2e2b9d59e9155145e34795106c17c | |
parent | 1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd [diff] | |
parent | aad3762f1bcc3e90c6f312669caa1115f4714669 [diff] |
am aad3762f: Merge "Fix build" into jb-mr2-dev * commit 'aad3762f1bcc3e90c6f312669caa1115f4714669': Fix build