commit | 5e35976ee0bdf35411ac1bfe52316d1583add98d | [log] [tgz] |
---|---|---|
author | Andres Morales <anmorales@google.com> | Fri May 08 18:27:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 18:27:44 2015 +0000 |
tree | cc69ef5b132a1885121be14037df5a165ccc5da0 | |
parent | d9f7b76a98b152fe195f48c0cc9daa95e07a20b9 [diff] | |
parent | f889e1b75f91a0ac6c0b93f3bee19277d172f6be [diff] |
am 1ac8591c: am 1cc5b151: am bccc75a7: Merge "stop including rootdir build.prop" * commit '1ac8591c9e0ac799a8a2e2a6e5dc1ab4701a6d93': stop including rootdir build.prop