| commit | 3208b615c5cde2b682c3bbbcd2bb064b14b57489 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Aug 15 14:34:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 15 14:34:09 2013 -0700 |
| tree | 2c0dbc42bbcbce4cd16918ca0591afdc1a339a94 | |
| parent | 477b12b45ad0c8e73aafe12e3056c051080c0de9 [diff] | |
| parent | fc8b6338510690f1f87c57b9d9c470e25fc48bcd [diff] |
am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp * commit 'fc8b6338510690f1f87c57b9d9c470e25fc48bcd': No need to filter out AndroidConfig.h for unbundled build