OSDN Git Service

am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev
authorElliott Hughes <enh@google.com>
Thu, 7 Mar 2013 21:23:22 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Mar 2013 21:23:22 +0000 (21:23 +0000)
commit7a9749eca06816ba3b63e55660bc1c2b7285dc52
tree55f5531730a72309d1f84bf35b324804b342813a
parent0f644ccf6dfb4f00473fc90f369d842e09ab13df
parent8a0157227242eeb7917f064e0d81014bcda6d8f7
am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev

* commit '8a0157227242eeb7917f064e0d81014bcda6d8f7':
  Regenerate NOTICE files.