| commit | d05b4af6593107ec01228f9c2d8f98b857cf054d | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Tue Oct 13 02:16:10 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 13 02:16:10 2015 +0000 |
| tree | 48f3dafd352bfc572cece13d4d5ffd71f8ea5fdb | |
| parent | d089445a6098da21372a38f735a7f33f22d1a8c9 [diff] | |
| parent | 585ab65c5816f8f9ff212487ffec797e8921697e [diff] |
Merge "Adding comment removed from failed merge (6acb240c)"