commit | a123bb4bf7aea7062f4920b2d07e22bb6b5e0555 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 00:49:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:49:25 2014 +0000 |
tree | e73ce6c355974fc143187d56e309ab807a5d3bec | |
parent | de3429045c5faaba481dd0388f293a766a9c7ee2 [diff] | |
parent | fad7414ffc00212f7c4af3331743a73b7dd9f740 [diff] |
am fad7414f: Merge commit \'eb168aca05a39029e71e8d517fc1290bb3163534\' into HEAD * commit 'fad7414ffc00212f7c4af3331743a73b7dd9f740':