| commit | 7a9749eca06816ba3b63e55660bc1c2b7285dc52 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 07 21:23:22 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 07 21:23:22 2013 +0000 |
| tree | 55f5531730a72309d1f84bf35b324804b342813a | |
| parent | 0f644ccf6dfb4f00473fc90f369d842e09ab13df [diff] | |
| parent | 8a0157227242eeb7917f064e0d81014bcda6d8f7 [diff] |
am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev * commit '8a0157227242eeb7917f064e0d81014bcda6d8f7': Regenerate NOTICE files.