tree 4b21fd952e1e28538421715ec728da3b9811fd1d
parent 4d61699f9db89b09d66669403118373249f8ee40
parent a8c2f0d0a64ca86eee827bd888b02e88aa5b1585
author The Android Automerger <android-build@android.com> 1333493191 -0700
committer The Android Automerger <android-build@android.com> 1333493191 -0700

Merge commit 'a8c2f0d' into jb-release

Conflicts:
	kernel