| commit | 9b19382f0e55be199da4b3f604fc114aba8fb2fc | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Wed Mar 04 15:43:45 2015 -0800 |
| committer | Mohamad Ayyash <mkayyash@google.com> | Wed Mar 04 15:43:45 2015 -0800 |
| tree | c63bfdecc67428c27202c50fc320f634ab7a0210 | |
| parent | a10263ed1f1532127a135943dce993443c5dca51 [diff] | |
| parent | fc759204d63f0c82f187d99f58efa4821674ccb8 [diff] |
resolved conflicts for merge of fc759204 to stage-aosp-master Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab