| commit | 5bb64976a0c3c4ad4a6127bbfa2169bcd2f2832b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 07 21:25:35 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 07 21:25:35 2013 +0000 |
| tree | ea83324346708bb3556e6741cf6253a177d8ec0a | |
| parent | 30be06bc7afc94d8f1b064e1d89ca757b1322ee0 [diff] | |
| parent | 7a9749eca06816ba3b63e55660bc1c2b7285dc52 [diff] |
am 7a9749ec: am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev * commit '7a9749eca06816ba3b63e55660bc1c2b7285dc52': Regenerate NOTICE files.