| commit | 2eabe5b7a9c396b1d6baebca7505a4e921312fc2 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Apr 14 21:38:02 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 14 21:38:03 2015 +0000 |
| tree | 05da73df79d30012c9ce2d4a7d3e9bb63099115e | |
| parent | 71bcd2aa5cefa767e76bc3117ed8534b67de21bc [diff] | |
| parent | 338e74648ddfe480cf4bfb52cf5a9bb8732e1135 [diff] |
Merge "resolved conflicts for merge of 1d5a2592 to master"