| commit | 3a8684117db531f3d56743ffa5a9c8ab7ccd0afd | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Mon Nov 10 17:35:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 17:35:55 2014 +0000 |
| tree | 44abe242d7c8ae395f4764bd6c1832d39108c4a4 | |
| parent | 20083734d92eb893c36278d2486404eedc0cc1f9 [diff] | |
| parent | 2885c6ba63850d5fd061460683de768617ed6b31 [diff] |
am 2885c6ba: Merge "Fix build" into lmp-mr1-dev * commit '2885c6ba63850d5fd061460683de768617ed6b31': Fix build