commit | 47dcb469db6e81b733a3f2eaa6bc4396ebfb3fd0 | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Mon Oct 07 18:06:51 2013 -0700 |
committer | Adam Lesinski <adamlesinski@google.com> | Mon Jan 27 10:31:07 2014 -0800 |
tree | 883b7a5dc7547060c165c061da6bbda39d66e016 | |
parent | 8ff15b4cada7998e78c93934ab2c869c322d7e07 [diff] |
Manual merge of e4ccb864 from frameworks/base/tools to frameworks/tools Change-Id: I4893e72caf3dfd68bd503fd8daeabc8550d770a2