am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
commit3881c3ae357b3befec9226bcbf72f5a916457f97
tree06a7b5fc61d07b7b9466c9527dab0cefee43a8e6
parent03d1873bd2c0fe904a81b0ec213bb37917d9516a
parent84a0fc9c00d5fa6facbd26eac7da00c58cea87a9
am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD

* commit '84a0fc9c00d5fa6facbd26eac7da00c58cea87a9':