| commit | 4fc2fd3ce521c504c1b038e426690db4f3a4d1af | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Nov 12 17:34:36 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 12 17:34:38 2014 +0000 |
| tree | 5394636d792612fda0acd646c2d5b92692b37044 | |
| parent | e9157de21bdf5560efa010a48cb5377115db899c [diff] | |
| parent | edaecc1db0584fa017822dfc2da0c968b53967e6 [diff] |
Merge "resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp"