commit | 32e8e0421c34cfbeffdbb35e57751e9c4d8d1fa2 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Tue Jul 30 18:17:17 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 30 18:17:17 2013 +0000 |
tree | b8e2080ee4fb14a99cdf0e1dd74ba8359f6cd2a2 | |
parent | 0d2155471f6a0df8d193d8132a0b5f740f8e2be8 [diff] | |
parent | 37c19bc2b36535e686782b7b5d4030d2fb7e2f56 [diff] |
Merge "Multiple-inclusion protection for Android.common.mk" into dalvik-dev