| commit | 5af7df9503e537d6834752084107b42b453cc4b3 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Sep 22 20:55:14 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 22 20:55:14 2015 +0000 |
| tree | e181df3e5809d369042d832b6a8fe4fbd978c5c3 | |
| parent | e56b3760278830a0a3c955a34f3a9b30443c5d7e [diff] | |
| parent | bc68463602b6c26cca8988e55df8dbf48ca653e5 [diff] |
Merge "resolved conflicts for 5d7b68d4 to master"