tree a7d76b7167e61a6d784434fcf1119f5973c4de8a
parent 509f7399b8f246f506307b22039e63323ec09622
parent e95aad61d841e7a472b4141808bbca0c7135b0f5
author Mike Lockwood <lockwood@android.com> 1274120643 -0400
committer Mike Lockwood <lockwood@android.com> 1274120676 -0400

DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken

this change is already in master

Change-Id: Ica43eae28b50d89d50217851aff7e62978abfa27
Signed-off-by: Mike Lockwood <lockwood@android.com>