| commit | 77fdd16cf3c662898af72778462dced701289f9f | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Sep 30 16:00:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 30 16:00:51 2010 -0700 |
| tree | a81199433d271dc99f235331c63af5423219f929 | |
| parent | b39c4ba316a523e4ecf0ac9e71377b8c5b35c25c [diff] | |
| parent | 3975280e0583d45de4708375622b22019a0df9f5 [diff] |
am 3975280e: (-s ours) am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE Merge commit '3975280e0583d45de4708375622b22019a0df9f5' * commit '3975280e0583d45de4708375622b22019a0df9f5': Integrate sdk.atree changes from master. DO NOT MERGE