| commit | 0634a437a35df3563ec25f720e64638464a5def6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Aug 15 14:42:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 15 14:42:57 2013 -0700 |
| tree | 0e54d80ea0cfbf14dcff4429f2ece7dcea684ff2 | |
| parent | 461cac97962d4353311d14ad092ecbe44d3097b1 [diff] | |
| parent | 3208b615c5cde2b682c3bbbcd2bb064b14b57489 [diff] |
am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp * commit '3208b615c5cde2b682c3bbbcd2bb064b14b57489': No need to filter out AndroidConfig.h for unbundled build