OSDN Git Service

am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetMa...
authorMartin Kosiba <mkosiba@google.com>
Thu, 17 Jul 2014 21:04:53 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 21:04:53 +0000 (21:04 +0000)
commit9ab6dbc6242e64dab7a5c1d0661415c1be453cdf
treeca33dafe833a6560bf6081cec3bfcf96a9262ca5
parent55144e0e21da322269ac8f64ced0f25a65d628b3
parent0db75fe2b01d96f4c0367ad90717f0c22b92a665
am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.

* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
  Allow for appending of resources to an AssetManager.