Merge commit '504c5d9c6e05cecabcb2404a2fd1a05259602858' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 18:35:28 +0000 (10:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 18:35:28 +0000 (10:35 -0800)
commite83cfe6980e7d8796bbe60ca46bad4342297ab99
tree06a7b5fc61d07b7b9466c9527dab0cefee43a8e6
parent070e4486c463244679631eb3f3692619f2f80f11
parent504c5d9c6e05cecabcb2404a2fd1a05259602858
Merge commit '504c5d9c6e05cecabcb2404a2fd1a05259602858' into HEAD