commit | d428e48aa1295519c49ace23905c2acf5a625ccc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:10:10 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:10:10 2010 -0700 |
tree | 0d4e0835fb1817c92a867edaecd822651b2794f9 | |
parent | 03f73ba453ca0da5805a2817c4440fbc1944d880 [diff] | |
parent | 3d96f18dd1f60d9ceca29cbce07e4572b03d2a97 [diff] |
merge from open-source master Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127