| commit | 6a8320575d53848ea693089c4eae73be9ac9b755 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Mon May 19 13:03:31 2014 +0100 |
| committer | Mikhail Naganov <mnaganov@google.com> | Thu May 22 15:35:48 2014 +0100 |
| tree | c9882f60edb37d18ced48c925fe13af1f6ff386a | |
| parent | 6c8dfc0e9bdfdcc515ed8bb94e87ddd7e75d0557 [diff] |
resolved conflicts for merge of 019c52fd to master Bug: 14582835 Change-Id: Icaddc919d2f85d969665af9ed93bfda248281976