commit | e6e82f7aab158e029e127b4333b14b876ad8b34d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:43 2014 +0000 |
tree | 1c876517c4ec1605c4d6e541c18d021d85476d3e | |
parent | 87d630108f4a30ee899d6ee96e2b565225653be2 [diff] | |
parent | bf0c789f0c0aafba0f2ed468aee20f99ca9381ba [diff] |
am bf0c789f: am d0b810ff: Merge commit \'b1299b7414b05ee48d680d1f0199a43b31fc103d\' into HEAD * commit 'bf0c789f0c0aafba0f2ed468aee20f99ca9381ba':