tree 86b1dc5c5eb31b97162595e7488083970f7b4b27
parent 2db4db04ec38c53f9189070782f2d1be7832761e
parent dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20
author The Android Open Source Project <initial-contribution@android.com> 1386293245 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386293245 -0800

am dd9a784a: Merge commit \'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88\' into HEAD

* commit 'dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20':