tree 4beb97cb9bf8da6c96823661518751f47992b86a
parent 512596d4254cb15ad329e3b78f3c867bd65208ca
parent b7371455e8da5f65ba4d1fb697fbe69b13be2d65
author Dirk Dougherty <ddougherty@google.com> 1275595441 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275595441 -0700

am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo