| commit | fc5151106fd3484484e3cf98254e1674dfa5be1e | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Wed Dec 16 19:09:12 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 16 19:09:12 2015 +0000 |
| tree | 83b09cc2d0e86b2124c8c8a0835e44b41e31aa24 | |
| parent | 0550f1b8041e6a4ddd3447ce2db8e101d1b45b03 [diff] | |
| parent | bf4b31f7b23b0bc7a2ed4fc779aac37c9c486eb2 [diff] |
Merge "resolve merge conflicts of 04ce46db64 to master."