tree 67a0105873fe9c856b157ba192f1aee1279aac32
parent 740c3e2e97a4cca24ecb534de72663ced238156a
parent 38dcb296c95b7fd0ca597fca5a1fc904bfbbfa69
author The Android Open Source Project <initial-contribution@android.com> 1275488912 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1275488912 -0700

merge from open-source master

Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b