| commit | 2bea99c03395b7299f0762e3c1f690058856b5ff | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Nov 04 03:42:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 03:42:26 2014 +0000 |
| tree | f757114220d7090803ca3d3c7f3db406568dade8 | |
| parent | 8f018e361ba050930a49b65225c512c8da9d316e [diff] | |
| parent | b2808c03c3de0d4fe6a986545fd506df0233b072 [diff] |
am b2808c03: Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp * commit 'b2808c03c3de0d4fe6a986545fd506df0233b072': Fix build due to bad merge