| commit | 896754566fd2318814c18da447aa0ea5ee807e6a | [log] [tgz] |
|---|---|---|
| author | repo sync <hamaji@google.com> | Tue Jul 21 12:31:17 2015 +0900 |
| committer | repo sync <hamaji@google.com> | Tue Jul 21 12:31:17 2015 +0900 |
| tree | d5a2f91ed2b769e1ff79d4b773950cbb1d29f6ea | |
| parent | 55fc58cb8f0a53151de48635c5f452bc10691e52 [diff] | |
| parent | b097c416308912353e1b188f1d92dfd06e295f5d [diff] |
resolved conflicts for merge of b097c416 to stage-aosp-master Change-Id: I3e0732ee61e5de40c53ade70ee1d9f6a4c3e77d6