commit | dc8881f8da59f5165a14f79b8467bf451d80a4bf | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Oct 27 18:50:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:50:34 2014 +0000 |
tree | c2fe4065a24e91699a48c05ab1520f74638f25dd | |
parent | 97af407b2015ee875080be096a1bcc5e7b4d2378 [diff] | |
parent | e44aebc63b5d165b0c16f521accabdc46fb573c9 [diff] |
am 7f984a48: Merge commit \'9f35e2bacf35ef884c2e97a9a3f72fe3f35c9758\' into HEAD * commit '7f984a48aa4e3385699f41b2ebbdde5a7fda3825':