tree 84dcc111b0e89da952f8b99e133a647adf4e5f26
parent 3827339f0c14fe20faf4e88753e7b9fcf48b7847
parent f485004fb17923478ce2953862a71edd246dce3d
author The Android Open Source Project <initial-contribution@android.com> 1386293258 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386293258 -0800

am f485004f: Merge commit \'d06c58378a85689b9b82a144dc684b071dc6681b\' into HEAD

* commit 'f485004fb17923478ce2953862a71edd246dce3d':