am 7244a861: Merge "Regenerate the bionic NOTICE files."
authorElliott Hughes <enh@google.com>
Tue, 8 Jul 2014 17:50:07 +0000 (17:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Jul 2014 17:50:07 +0000 (17:50 +0000)
commitaedc14b166e9eb1213637cf7ebf8e08ce29ab0dd
treefaac05b43d3e17c3ada6fda63e5cd6d3a8a61fc1
parent4568e344c0a7581dc1b32387ba18c99df76ffeea
parent7244a8610a1b6f7cb38336696e15e2e4ee04613c
am 7244a861: Merge "Regenerate the bionic NOTICE files."

* commit '7244a8610a1b6f7cb38336696e15e2e4ee04613c':
  Regenerate the bionic NOTICE files.