| commit | 5f5bd8848c3374e6429a82840573526c637fffc7 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Wed Jul 06 00:45:15 2016 -0700 |
| committer | Jae Seo <jaeseo@google.com> | Wed Jul 06 00:45:15 2016 -0700 |
| tree | eca5d2e70f1c737ac8e5a833c44c1e8ad2ba84c2 | |
| parent | 9ede567f7caa0171fa6106d097f6a06a0646820c [diff] | |
| parent | 5b6c03415c0ceb3f7f8b9022ccdab0f1d479616e [diff] |
resolve merge conflicts of 5b6c034 to stage-aosp-master Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe