commit | da2e97cb5aebad2a6fa3478167e528b4bcc5bb63 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 16 09:48:16 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 16 09:48:16 2011 -0800 |
tree | 7aa1ce39b517991db26398c62bc30253aca0f19f | |
parent | d0dc0430b4db7249f1408b9ade9f9184ec18d3f7 [diff] | |
parent | 2c707f9bb2bfc5b14029c0f0ed7fb5b02756cbd3 [diff] |
am 816e68e2: No-op merge from ics-mr0 * commit '816e68e2fddd56c34f864dc5647801117a51720b':