commit | bea97a897b9102d5d75bcb7a41e02eaff9a7506d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 09:22:21 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 19 09:22:21 2010 -0700 |
tree | 80894ff99019e573f50527729f3659b2f73a9243 | |
parent | b39b0f32d1c24e326886d8d27c8ad7dde38e28d0 [diff] | |
parent | 2dc7c6c4153380fc64b99d37d763d3f0d1cac04d [diff] |
am 2dc7c6c4: merge from open-source master Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken * commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d': Add and document .nomedia constant for MediaStore (Issue 6365)