diff options
| author | Nick Kralevich <nnk@google.com> | 2010-06-10 11:54:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-10 11:54:53 -0700 |
| commit | 7984c8c7abca1af5b43fbd28740ea8138f35d2c6 (patch) | |
| tree | 90842d242f4b5a4dc2ede91b74742fc61ebde5f5 | |
| parent | c419e471fac0dae649608e7127ccd7ade896a28c (diff) | |
| parent | 5ca447aa0c63a20bf1e121f0a54bbd1a46ccf27d (diff) | |
| download | frameworks_native-7984c8c7abca1af5b43fbd28740ea8138f35d2c6.zip frameworks_native-7984c8c7abca1af5b43fbd28740ea8138f35d2c6.tar.gz frameworks_native-7984c8c7abca1af5b43fbd28740ea8138f35d2c6.tar.bz2 | |
am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken
* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
0 files changed, 0 insertions, 0 deletions